From 1affd425a190541a74cffc67e796b153ae126bf5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Wed, 8 Feb 2017 14:25:30 +0100
Subject: [PATCH] window: Simplify _set_focus

---
 gtk/gtkwindow.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 33218c718b..2664506c8d 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2492,21 +2492,16 @@ void
 gtk_window_set_focus (GtkWindow *window,
 		      GtkWidget *focus)
 {
-  GtkWindowPrivate *priv;
+  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   GtkWidget *parent;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  priv = window->priv;
-
   if (focus)
     {
       g_return_if_fail (GTK_IS_WIDGET (focus));
       g_return_if_fail (gtk_widget_get_can_focus (focus));
-    }
 
-  if (focus)
-    {
       if (!gtk_widget_get_visible (GTK_WIDGET (window)))
         priv->initial_focus = focus;
       else
-- 
2.30.2